some mods to reduce machine dependency
more de-localization