rearrange dependencies...