More RTF rework