tweaked setup file