Rewrote init-phase stuff: