Greatly improved localization