Upgrade from trial 17