More progress towards the dependencymap