Modified after the class on Sep. 16