Update to single window format