Tweaking again. Maybe this time it's right?