Grabbing Chris' changes to update