Tweaked setup