Upgrading the beans [WiP]