Changed a few things, made delete all work again