Getting it more like what it will be later...