Hot: groovefunnels-upgrade