fix marshall for adding and removing data