Add option to display names (defult is now false)