improved setup