Improve add friend but still need some work