Improve the building (still doesn't work)