Modifications for windows