New conversion with dipl and norm conflicts resolved.