Modified the code based on feedback from windows usage