got rid of dependency cycle