more refactor, chaged the deps again