Fixed validation process, now fully working