Also need to adapt JZB header file