got rid of some echo stuff