fixed session, working on pagination