changed around template