Addressed some more of Marcus's comments