EV-0: Some changes