hard changes + new pages