Adding in the C-value stuff.