make it so I can change echo
Merged from tuesy