- Rewritten initialization code