tweaks for new setup