modify for submit