made changes according to validators