CS fixed and adding the missing paging element.