Changing ccdv.c some more