Final beta: fixed pagination