re #22 - restructured