Fixing dependecies 2