Update feature: Buddy functionality can be enabled/disabled and is disabled by default,