starting work on pagination issue