revert social integeration , and add it to secial branch