More changes I forgot the first time around