Changes for first challenge exercise