Added Eric's Changes.