removed unneeded FetchPriorHistory, refactoring