updated locator
optimized logging