Updated models

So close