underscore templates updated