vax: update to fit rules, then update all sizes