improved sidekick-switch