Fiddling around with cheetah_ana_mod to improve efficiency