changes in progress for fabd reorg