Fixed friends alignment and MS problem