Improved setup