Changed some extra default parameters