work on history + add gard