Preparation for Windows version