Started to change old model.hlpn to model.npndiagrams