Nate's testing edits
resolved conflict