More calculation tweaks for weekly response. Moved itself to its own method.