Fixing models
Fixed model problems