Added 2-stage-init