CSD-ified version