Added second refactor