made improvments to capture and cluster