little bit of reorganisation