Capture improvements