Updated for Remove the state field add the gender options.