Updated to work with Windows