Build it better (24/33)

Build it better