slightly improved templates