Some changes and changes for FB