a bit of reorganising