another tweak before doing 3.1