You've practically done now what I advised you to do in my first reply (post #2).
I have bolded the lines to make it clearer.