Updated the model

Now this *should* be also evauating the NO_FORGET model