Another stab at the dependency problem...