follow up the refactor.