Update. Finished extra credit