Added experimental subtraction handling