significant work and renaming md.c