More updating and testing.