and another reordering of dependencies