added multiple location capability