With first validation fixes