2nd commit all validation working with coreect functionality