major tweaks
further tweaking