Rebased assistants with fix