Update to EVA code