Modifying to reflect dependcies