change to Tanja's template