Better and completed es translation