Feature/OPED - Page 2