change from return to echo