more work on internatiolization support