Model fix

So I guess this fix is kind of finished