Trying to fix friends

will continue tomorrow