Comments added on Windows machine