added localization
further forgified things