Changed to work with Windows