My revised CI template