Fix and Add