Refactor c_echo() and add