Added welcome and activation flow