Cleaning up and adding lastrun