Additional work on the friendship functionality