partial revamp ext/intl