Upgrading to 2.4.0