Updated with new building data