Major tweaks
Minor tweaks