WIP changes for page flip