Final changes to 311 hw3