updated exercise 2/1 to fit new google constraints