change echo to return