put history back in, but it is still confusing