Updated Mockup & FlowChart