Update to newer "capture" interface