Changes for 2nd part of tutorial