window types collapse properly now