updated general templates