re-organise things a bit