Some more template changes for Martin
Template changes for martin