Update to latest bones code