Improve history
Integrate history #12