reorganising a little