Updated for windows 

Updated for windows