NOREF: Restructuring the template call once again