fixing circular import nightmare