WIP amwg 5/6 changes
WIP amwg 5/6 changes