Working on Translate (reverted from commit 10b04431b02d9153443306b4b2db52551059681c)