Updated to show names properly