Some modifications
remove last-run