Better working translation code