Improved building.jade