Jason changes

looks good. I'm going to merge