added partials and validations