Changed defaults to my defaults