Update to elvs latest changes