Rewrite add/sub