Update from kivra