Minor refine
Merged with Win