Modifying after Ted's 2nd round of comments