Build smart (31/48)

Build smart