prepared v2 code for Zorro