This is the form we've come to after discussing with @njam and @tomaszdurka 
Maybe we could discuss this again this week since we're all going to meet in Basel?