tweaked setup