fb handling changes