changed to include fb stuff