Maybe this will take care of the dependency cycle