Rework the onboarding process