Delete #2 improvement