Made changes to distinguish "submitted" from "running" state