More tweaks, now for 2.1