Better formatted but not quite with TR