switched to cdmlib 2.0