.UPDATE Upgrade to new version of jctools