Update files to be inline with step 6.3