Deletion ready, only update left + tests of course