Massive overhaul of the NL translation