Preparing for the window compativility