Massive updates, optimised code