Karen, go a step further and explain that when doing this rake exercise you might want to take into account the balance of your boat, ie do you have excessive weather helm ? if so if you find your having to put extra rake on to reach these numbers, instead of moving mast at deck level to get the rake correct move the mast foot forward. If you only moved things around the top deck ring and you already have a heavy helm things would/could only get worse especially if you drop the rig back more. Or maybe you already had too much rake in which case the foot might not need the adjustment. Plenty of playing might be needed to get all working in the right direction. But good fun understanding what you have done.
Best of luck trying, Ken Carroll