Testing changes from windows