Change more initialization code