More refactoring, new image