Simplification, window fix.