More improved validatsion