Updated RM WMFFC and RM WLFFC