Merge to test Capture functionality