Changed to echo = T