added submits return feature

and orginization