Updated initialization sequence to handle new case