Critical bug fixed. Refactoring create friendship