For OERP 7.0