From Andrew -- made name display smoother