Updated functions. No CDS update