use the _new macro instead of _old also in trunk (HH)