Did some work in the modelclass