WIP: new CI variables