Update following FB comments