Example with updated templates