Window builder logic change