Base: Minor restructuring of initial flow