In progress. WFI dress rehearsalcommit