#6 Fixed translations and constants