Remove Init.
Expand with init.
Correct conditionals for init.