Made history more friendly to different input formats