Prep for use with citools from old DTL repo