Dependency nightmare hopefully resolved