Window 2 added
Merge conflicts resolved