Updating based on valgrind testing which just came in