Cleaned up echo_component