Consolidating buildings and added location creation.