Fix and Add functions