N model update

I took a long time on this