Updated capture tools