Added location getting