Enhancement: Closes #388
- made final adjustments to the text to be according the template