added names and validations