Here we go again. Tweaking the main and adding the new.