Few adjustments to make in work in Windows