Reintegrating the original single window version