reset changes, still needs fixes