Major changes to the FAB, etc