changed the system types to correspond to CDT