NOREF: Restructuring the template call