handleCapture improvements