addElement should work fine, removeElement must be fixed