Modified setup and initialization.