- Last commit before CodeBlock refactoring