Brought pagination, removed loop back