Finished #2 after the fact