Improved setup.