simplify, added page