just redoing our original version to a updated version with less echo and static