Second part of the brutal global refactoring...