Removed warnings. Circular dependency. Help.