solved some interdependency issues