Updated code regarding the faq's functionality