jxs refactored