Build smart (40/48)

Build smart