Changed to solo template