Tweaked switcheroo, added switcheroo buffer for range