fix bug, move to streams for friends
be more resiliant in face of errors