removed some of the validation