more friendly; and add check to submit button