Copatibility Update to be closer to the W8 App