Changes after Ted's comments (mail from 2013-06-24)