some translation & follow upstream