reworked dependancies