Preparing for switch to windows