Adjustments

adjusted providers
moved some things