Add and switch to using simpler activate action for controller changes