C3 s6 build questionnaire

#201 @amatar07 @ytarek @marwanelderwy  @maged918