Feature/cheetah fixes