reordered some dependencies