UC-29 Making change to allow switching between extensions