johnmatter merge jf support from zellen