ADD channel and FB improvements