Updated and Tested in windows