Fixed model

All tests pass