Addressed Anne's comments