Primitive CD functionality added