Added more pages and methods
Resolved conflict