Much better!
Yes he did, and a fine job, too! :)
However, I still need to solve for the amplitude, A.
He gave r and s in terms of divided A; which results in s/r being independent of amplitude.
But the equations for s and r, require knowing both x and y; aka phi2, and 1. not just the...