improved templates