Putting the Focus Back on Diagnosis