further syntax changes, up to step 3 in part 1