update to include the Z0 case