Cve block almost done