Nadir's changes : new corrections,weightHepNup..