updated for recent fb changes