Improved /cdi