Feature/cheetah closed