2nd modification to v5 of rstm