added location controls