Added tweaks