More changes after additional testing