Final changes to Assignment Four