redo dependencies a bit