level & history fix part 1