adding changes for buddy