switch to using buddy