added support for jjb