Added location switch