Continued addressing Craig's suggestions.