More edits to set up for GWMM.