Update now completely works with indexing, only remove needs to be tested