First major revisions from Cleaver