OGM-481 Incorporating review remarks