#3 rework some templates to make them unified