added more validations