Several masonry changes