some syntax changes in validator