reorg for fabd
changes in progress for fabd