Complete rewriting of the initialization process