add and clean up
Merge branch 'HistorySetUp'