Improve my history setup.