Making ChoosePlace a little more efficient