Improvements for windows