new submit workflow, simpler and better code