Added removal function and perpetual updates