Improving the set up routine