final friend fix.. i hope