CDI-181 major changes