Changes up through Assignment 8 (which is not yet done)