added some more stuff to try to get non echo