Improving setup a bit;