Add new questions to fix #121