Just before some refactoring