Walk-around and puppet switching