added more questions following the template and documentation