started to work on the optimization and the pages for that