Improved fb integration