new masonry draft #21 #6