p07 PYRSS2GEN replaced by a custom function