- major tweaks