Changes based on Ned Freed's and Greg's email