changed models, mainly Question