changes to echo.v (incomplete)