Slowly upgrading to version 2.3