couple of validations added.