Joel's edits 11/3