Circular dependencies. Slight change in scripts.