Optimizations for Localization need to test