rework ComprehensiveExample