updated to make windows survivable