Exactly. The solution already exists. However another problem is that the arxiv is creeping towards the old model ...