Updated models

A few more tweaks and we're done...!