added more functions and pages