Refactoir to Historyoverride