Fixing up onboarding with new scheme