tweaks ahead of class16