updated to Page from PageWait