Reinstalled toggling functionality