1 translation fixxed, TODO updated