changes for latest incomplete changes to mw 1.22