upgraded the validation stuff to better mimic L5.0