Updated to use of pagerlib code