changes for GMAVENPLUS-23