fixing history... slowly