OGM-392 Incorporating review feedback