- Improved initialization.