added support for new windows