Improved window plan.