In Progress

re-check and fix bugs for the flow