Added better building experience