Massive refactoring of architecture, new Update fixed