Social refactor works