changed some validator rules