moved to new flow based setup