re #78 - rearranging stuff