Reworked the building!