Made buddies more robust