Made history less complex and less bug prone