Cudi improvements