Moved code into jz/