Add remove problem PARTIALLY fixed