Assignment5 updates.