Dev snapshot: Z shape completed