EXPERIMENTAL : Upgrade the recovery