New maintenance for zebra2