2.3 -> 2.4 upgrading advice