refactoring, submit implemented for web sync