Updated FABatching