Updated with changes suggested during the walk through