a few changes to the structure of zero step