Correct. I have all of this worked out if anyone wants to check my work. I validated it through John Baez.