Added location controls