Upgrade funnel

Signed-off-by: chatgris <julien@stormz.me>