dependentancy correction
Added defaults