Improved the window example.