Build smart (35/48)

Build smart