Some Improvements
Final Localization