Updated for iPad and Windows 8