added guards and additional pages