Last stable version before refactoring