committing changes before refactor