cleaned up the echos