change return to echo