This is the new template file. New name solves issues