Buddy almost fixed with transitions