adjusted some templating