FB logic updates