merge in refactored MGW