More work on buildings