y.1, y.2, z.1-- corrections per Matt