Tony refactor to remove res repetition.