Change echo to return