re #78 - reordering and adding stuff