Merged SignatureCapturing Update From Herbert