CLASS updates. Thanks Andreas