changes for GMAVENPLUS-16