Reorder again to be even MORE semantical