Removed debug information and testing alternative conditional template criteria