modified Setup with some tweaks