I improved the validators a bit