Used 'values' instead of 'input' keys from  state, so that form_alters are less likely to disrupt form submission.