Refactor Submit and Aoj.
Use run id.