Dependencies adjusted (again)