updated underscore templates