Improved setup stuff