Changed localization to be more static