review and changes for end to end flow