Updated Form for Validation