slight edits to reflect new changes