supplier flow and bug fixes
supplier flow and bug fixes