#12: update for submit logic