Changed some of the default to do values