Massive updates from testing