Changed some echo's