Changed the validity tool