Changed echo to return.