Changes according to SHA's branch