More Tweaks! Getting closer now!