Initial Changes for C/D