Localization improved, more robust.