new setup, few tweaks