Fixed updating and removing.