Updated EVDS (again, critical bug)