porting second NPSS model, almost finished