Remove the cleanup at the end of the function until someones comes up with an algorithm that doesn't break updates.