final commit for intermediate social features