added initial Location Selection