update submit procedure, and add in 40 hrs check