Improvements to Window