Updated with rfm code