Adding in Pablo's changes to the building section.