block onSubmit impruved