Changes for windows