@sipa I can rework this, if you want?