update on FMS code review