submit -> refresh
refactored