localization problems fixed
merged code