OGM-396 Incorporating review remarks