[GM] changed optional questions