20 val run, ready for %-based refactor