Solved circular dependencies problem, take 2