Improved c.da - fewer magic numbers