~# changes on templating and adjusted some sets