Changes to the Partner Switch Feature