Added velocity paging and proper calculation