Updates based on Evan's comments