Fixed #75

Rewrote Buddy Function