update from npellet 2