rework dependencies