Re-implement corrections to the model from !61 (closed).
No changes between version 10 and version 9