flipping some dependencies in and out