Added ability to select and highlight