Again modified zoo class