some more Template changes