Updating the template, according to #368