Removed circular dependancy.