Small rewrite for Zipper2