Small changes to model
Changed quesitoncondition to be able to do and/or