halfway commit before refactor, nothing to report