More before script tweaks