Yep he is aiming for 2022 season now. And next year he tries to convince Toyota to hire him for a full season. Personally I think he is done and will not drive for a wrc win or a factory team ever again.