Upgrade to the latest Catalyst