Finally working nicely

I hope