Building 1 revised... slightly