Delete and Add functions properly