Replaced validation with validator and changed flow a bit