Add windows to control flow