Final changes for hw12