ADD comments section & update template