adding in more history tracking changes