updated from new sour-template