Fixed Bad Logic / Removed echos