Made history work properly this time