Improved and extended translation