redo uncomment templates