added ability to toggle clustering