step 5: add generic questions