working on user flow
merging with latest master