Rename remaining, and add running.