Put in validation

Put in validation