Further localization work