change dependencies to unclutter things..