Use new wayfinder RC