re #22 - the new structure