changes for GMAVENPLUS-21