conversations refactor (next step)
conversations refactor (next step)