Submit changes required to move to version 2.0 of Buddy