first change for window

merge demo