Reorganize a little bit m9