Updating defaults, to work more consistantly.