Tweaking the setup