Updated based on discussion with Ted