some changes for jibbr