Worked on state preservation for IPAD