dan's update

updated templates