Minor additions to add window