PR for code review

Opo sir. i deleted this also