Change to Bone class