command: capture command now handles both types commands