First rebased version. Physical delete is not working right now.