updated templates
updated sample