Last ammendements to the model paper, hopefully ...