Post refactor.