Completed hw3-1