Use correct variables
Add pager output