Upgrading to Kiwi 2