Revision to flow. This flow is tested on local.