removed hot fix and took away reset