added extra validation;