bit of re-organising