implement mason edits