More updates based on Patrick and Harvey's comments.