Added  self locator