Function 1-2 of Challenge 7 done