reordering for @dirk-thomas's review