Finish adding history, need to tweak some parameter