Code review- PLAT 1237