Added client-side validation back in