Some changes for Week04-Bootstrap