Differences from FAM


Design and implementation changes: