incorporated Emily's Changes