Pick places, not assumptions

Staying connected when plans change