Modifications for CDC