Windsor's template edits