added options and full page