- Added ZIGZAG support