added initial flow and window toggles